Cleaned up long methods