Fixing lint and spec