fixed WS
stripped
code cleanup
removed cleanup