Cleaned up the code a little and changed mappings