change declarations, format code