More refactoring, added (maybe) prefix ++/--