More Whitespace and commenting

Should be all cleaned