Improved new code readability, removed getStats that was unusable