Cleaned up the codebase.