Code style changes towards uptopia