Added comments and reduced code size
Updated to-do list