Polished more code