Whitespace and removed useless stuff