Code refactoring and back to the margin.