fixed method headers and formatting