Added more style. BTW, good commit-message