slight restyling and cleanup