more code prettification