Commit rewrite that was suggested by Jason to make the app easier to use