Cleaned up log statements a bit