doing some cleaning in general.java