Whitespace nd move some comments