Minor cleanup & Rank List added