beautification

Thanks for tagging me in that commit you did a week ago, I felt free to do some beautification on it.