Some changes based on suggestions in #11