cleaned, made it simpler to use