Cleaned up unnecessary gets