[DEV] Cleaned up a few extra lines from the merge of pull request #14