Code cleanup for code climate