build cleanup
improved formatter & contentassist