Cleaned routes, updated form