collapse if statements
get rid of a bunch of nasty formatting
more old string formatting