Nice style && some fixing