Second commit

Cleaning things up for GitHub version.