Code improvements + added test