clean spec code, alignment & comments