Cleaning up and adding some validation