Fixed indentation
Exporting struct fields to allow for json.Marshal()
Removed getters (redundant) and updated struct fields
Updated test