comment cleanup
cleaned up logic in button handling