Minor changes before style revision
Use K&R brackets consistently