1255555
A little bit of refactoring