#1 Fixing lint warnings