Fixed all nitpicks