minor style changes and fixing some merge issues