[~TASK] Fixed type hint, some reformatting