More code standards; cuddle else and consistent comment style.