cleanup classpath and use declarations
whitespace
remove unused constants
update tests