Tidy a little and comment
Remove temp variable