Bugfix
Code optimization
Convention code