Performed refactorings

View resolved code health issues in past commits