Beautify code in model classes