removed some whitespace and useless helpers