Commenting and cleaning up code (#17)