More methods cleanup