Small refactoring
More refactoring
Improved positioning