Small adjusments on last commit