Cleanup and codenarc fixes