Code reviewed and fixed up to standard for my code comments