removed hard coded, hard to understand constants