Clean up a bit, use constants