Code cleanup

Comments, renaming of variables...etc.