- Minor refactoring
 - Added comments as TODO's