clean up method calling
fix cop groups
make method a bit smarter