fixed formatting, return values