MODIFIED: fixed all linting issues