I added some validation specs and cleaned up some formatting