clean up and use less constants