Improved readability, added friends list