removed extra whitespace
made a lot of new changes