cleaned up source code from previous major commit