fix comments from pull request

pep8
combined 2 if statements
use list comprehension for get_btn() function