A bit more code formatting