Add arguments for decorators, fix lint