fixed formatting and method return