Some cleanup. Mostly rais-ify checkins
Merge pull request #1 from CoolCulture/initial-cleanup

Some cleanup. Mostly rais-ify checkins