Making the code perty