More code clean up as per code climate