Code tyding and more configurable options in the script.