Some lint stuff and fixing a cosmetic bug