Cleaning up
Added comments