Fix indention, optimize imports