* Include only necessary classes
* More code formatting