Quick refactor for cleaner, more compact code

It's a compact app, after all