Use Attributes Rather than Hash Notation

Makes things a bit more object oriented.