More cleaning of methods and removed errors to package