Be more efficient and concise

Fixes #38