All validated. Cleaning up the code.