Some cleanup to tryout code