fixed some formatting and unneccessary parens from the previous commit