Cleanup to make readable