Some improvements.. Code hilight