Cleaning up codes
commit again
merge completed