Cleaned up codebase.