styling, cleanup, todos