Crazy lines
Some refactoring...