Commenting and making code more aestetic