Adding some improvements

Adding some improvements.

Trim at classes
Indent at some source codes