cleanup and style changes based on feedback