Naming cleaned, comments cleaned