Cleaned up methods