Fixed WQ issue and formatting