cleanup the logic behind window separators (and make them work)
add some whitespace for readability