Fifth Commit - Minor refractoring of code and new scripts