Updated a few minor changes to improve the flow

Signed-off-by: Trent Houliston <trent@houliston.me>