Formatting, removed if / else flow in __name__