cleaned up internal methods
updated version number