Removing some warnings
Removing warnings
Removing warnings
Refactoring code to cut down on duplicated logic