Cleaned functions; started alphabitizing