Cleaned up code. Closes #197