Surface level refactoring to make the code more readable and less
confusing