Reordered functions in controllers and models so looks logically good.