Cleaned up NewClient form a bit