Update spacing and remove weird conditional. Weird.