clean code in some places
Merge remote-tracking branch 'origin/dev'