Simplified build, changed markup & re-indent