Cleaned up source file