Removed dead code. Minor Refactor.