new method
more cleaning
whitespace