Style cleanup, exceptions named