cleanup of class separation , whitespace