Refactoring the code

To change Draw type just change the Constant at the top