Cleanup / remove a few lines

Just removing duplicate logic
Merge pull request #37 from sphia/ocd/misc-cleanup

Cleanup / remove a few lines