Added dealer input
Minor spring cleaning