Generalized ArrayList to List in most of the metrics.
Cleaned up a little