fix console output and refactor unsued methods