Make the code more maintainable

Despite the code around it.

Thanks, @jlee-r7!