PerfectClass not abstract anymore, Formatting and clean-up