Clean up

Remove pry, extra spaces and explicit return calls
Add tests for missing fields