Formatting: Break long if statement and remove old comments.