Cleaned up logging, strings etc for production use