Cleaning things up.

Minor fixes on data gathering method.