PSR-2 clean up of Bolt/Field/