commited all files
code cleanup