cleanup of code, more professional style,  +some text