Coding style uniformization
Add some classifiers
Explicit is better than implicit