Hacker Rank : Misc cleanup