Little bit of clean up and start javascript validation