Version Beta 2 : Refactoring code