0.3.0 dev - Removed some slight code duplication

Removed some slight code duplication