trivial tidying
refactored & tidied
alignment, names, concerns.
1.3