Got rid of confucing button if/else, added comments to areas to better explain