A little help for someone. Its a simple rework to clean up the code and make it slightly more modular
