Small edit to logic and whitespace