no functional changes, delinted the code

code rework to match style guides (lint free)