-fixed bugs
-code structure improvement