Made the S3 accessors a bit cleaner