Revert bca059e..97dcc2a

This rolls back to commit bca059ec493edb70d8fafcf77fedb89a4d0c948b.
Tweaked some method declaration orders