method signature improvements and style fix