Layout improvement Collection

Mostly @Override, also split up some long lines.