Changed some formatting and tried implementing computedProperty