Commenting, removing spaces and coding comments, cleaning up, etc