facelift

bit more descriptive names etc.