Models Modified

Used the AR conventions
User Changes

Made the code cleaner and better.