Started to clean up the code
Further code cleanup