changed method name
cleaned up