Cleanup code formatting, drop unused add needed imports