Cleaning empty lines, commented code, and improving code layout.