removed actions and fixed up formatting