Missing import
Improve indentation
New lines cleanup