code formatting
remove dumb helpers