making the code production ready