change to package visibility
fix bug for empty space at the end of line for variable declaration