improved styling, editing