code readability - clearer variable names & remove placeholder function
add private & public to indicate internal & external functions
minor tidy ups
fix discount calculator