Cleaned up source files