a bit of code refactoring :)
a bit of code refactoring :)