Cleaned up some 'puts', added a spec