[TASK] Code clean up and add option for production mode