removed extraneous methods and cleaned up constructor