Updated

Updated on_message, cleaned up variable names