Cleaned up and added string lookups