Fixing, refactoring usual stuff