Remove unused import
style: improve indentation and naming
style: improve naming and some indentation