cleanup some of astyle's mess