Refactoring, making things a little less hard coded.