Cleaned some table lookups and added relevant strictness