Moved methods around.
Removed unnecessary methods.