revisited code formatting