Fixing and linted for Angel works