some style changes, the exceptions will be updated tomorrow