Bump version to 1.6.1

+ some code formatting and such