code improvements - remove final for static methods
code improvements - simplified boolean if statements