Refactored the simpler methods. The trickier ones come tomorrow.