Small refactors first version on the way