#37 minor improvements + code style