Fixed up warnings
Fixed up warnings. Refactored. Renamed