No issue - abstracting more stuff into functions