Some cleanup
Fixed formatting issues on init during editing