Removed separation between statements and expressions