Refactoring, bugfixing, nicified