Minor cleanup of src/ directory
Merge pull request #1 from dahtah/master

Minor cleanup of src/ directory