Updated comments and improved ease of use for users