Simplified build & re-indent