Remove underscores from public attrs