minor cleansing. removed unecessary methods