Added Current Room Connections && Cleaned Up Code