Remove unnecessary prefix
Improve appearance