So my hope here was only to fix the style errors and not to refactor the code.