Addressed lint issues