cleaned up/removed main