And additonal set of improvements + lint