Cleaned up methods names.