re-factoring and cleaning up the code