Single file was too big. Split traits in own files. Also, make traits more descriptive.
Remove unneeded code