Cleaned up names and jquery