Clean up and variable rename
Make decorator more interesting