Simplify params handling, misc cleanup
Shorten methods, clean up attributes