Refactor and Cleanup

Created by: stratact

Work-in-progress. Don't merge yet.

Removing unnecessary to_string()s method calls and String arguments. This should hopefully speed things up a little with less allocation and more borrowing.