more code style cleaning