Swapped out hardcoded values
Clean up