Code cleanup (whitespaces, one-liner ifs).