Removed unnecessary comments, added contacts
Added some empty lines to make editing easier, removed obsoleted functions