Cleaned up after refactoring