Refactoring

Hi there

Please Accept re-factoring

PS :  Add a development branch to project