General Improment

Little performance improve
Little interface arrangement