code style: some manual cleanup

astyle cannot catch everything ...