Broken methods out for better testing