Refactoring code
Some work on Friends list and Parties