More refactoring - Fixed all method calls to use SendMessage instead of objects, cleaned-up code.