Cleaned up code and changed validation settings.