Some refactoring
Close your eyes please