Implement suggestions from #1 & #2