Cleaning source code for initial release