Cleaned up codebase