Fix .gitignore + optimize imports + formatting code