Little Refactoring the source code