Code cleanup in model