Comment and method signature cleanup