#347 Fixed other code smells related to last commit. Would have done as one commit but things were working so well before...they work so well now too.