Cleanup

and removed bad manners