Re arrange methods order
Refactoring : duplicate code