improved code formatting and removed useless imports