Clean up

Cleaned up some things in that last commit
Extracted all constants