[^] few personal code conventions adjustments on Chapter