cleaned up ws