Code cleanup. Fixed/Added comments