begenning stages of performance optimization and pre-release refactoring