cleanup and styling updates