styling, getting ready for merge