Code climate cleanup 2