minor code-cleaning changes 
 - fixed instance access to class variables
 - removed unused variables
 - cleanup imports