little cleaning. Good for initial demo