Cleanup and small edits