static methods changed into private