Commented and minor revisions on user inputs