some whitespace, removing unnecessary vars