clean up code a bit
Merge branch 'master' of https://github.com/doodzik/defp