hardcode fix for completion

optimize imports. and reformat just in case. Cmd + Option + L