Small Refactoring last commit f77e9972db6c9d181a211f74ce8d3c4695c920fe