Renaming files.
Restricting logs during tests.
Code cleanup, indentation, etc.
Merge pull request #123 from rhyolight/cleanup

Cleanup