code refactor
code refactor
simplify code
code refactor
code refactor
code refactor
code refactor
kill compiler warnings