cleanup, indent and copyright