Some minor changes; mostly code formating