Refactored instructions and code climate items