Moved some methods for clarity