More optimizations/refactoring