Removed lint warnings