Refactored, Got rid of warnings

^