indenting trait methods
cleaning up alignment
adding top level toggle