little refactoring
package level is working