refactor MAC calculation
added TODO items to README