Cleaning code, comments