Cleaning up hardcoded values I put in to test with