Spacings

Comments, code rewriting, spacings.