Merge "Cleaning up main code"