group accessors, remove unnecessary reference using @
fix requires in tests to correctly reference files
remove unnecessary comments (comments get stale and ignored)