Clean up and rename many methods