Alpha4: Some cosing standard changes