Clean up methods, match method names to purpose