Code clean, changed method signature