Code cleanup

Added comments