Corrected abstraction and accessor methods 

Also removed unused variables.