cleaned up statics/finals, logging, closer review of tests