* Fixing lint warnings