Removing lint warnings