now owkreing better with some whitespace clean up