Minor spacing and code cleaning