Cleaned up setup and jpyutil