package rename licence header
minor code syntax improvements