Cleaned up the simple version routing a bit