Cleanup methods, move responsibility of changing state to transition.

Indent access modifiers like `protected`.