reformat optional.hpp to be more legible and less linty