Clean up
More field awesomeness