General cleanup + autoformat