Improved comments and readability
Minor