cleaning up source code