Cleaned up Senna class by moving mappings and conversion functions into class and making them static