Cleaned comments

Comments are organized. Deleted unused variables.