Clean stack trace

This partially addresses #4