prettify
remove unused boilerplate