metrics moved to metrics package, more definition of compare method, style/formatting updates