Removed Binder and cleaned up Main Class