cleaning + comments for stone class