fixed  formatting, and method names