Cleaned up Jansson