tidying and semicolon rampage