Cleanup remove commented functions and reorder a few calls
Cleanup remove commented functions and reorder a few calls

raghavkarol/dotfiles,raghavkarol/dotfiles,raghavkarol/dotfiles,raghavkarol/dotfiles,raghavkarol/dotfiles,raghavkarol/dotfiles,raghavkarol/dotfiles