Cleaned up the code.
Merge cleanup to master branch