add private modifier to locally used functions; remove unused functions
move function to test class
remove disabled code lines
code simplification
code simplification; possible function replacement