Improve after review

closes #31