cleaned up help and naming conventions