Version 1.2 (refactoring, performance improvements, general decrapification)