Apply new code style and optimize imports