Code Clean up + simplification + organization
commit deleted file