Refactored some code according to best practices