Code golf, cleanup, method sorting