Reformatted to allow conversion in Ubuntu
first changes