Updated to use reader & accessors plus cleaned up formatting