Make several small semantic changes
Merge pull request #1 from StickmanVentures/semantic

Make several small semantic changes