Updated codebase for simplicity.