Refactoring out obsolete code and updating log information

Closes #7