Refactored files to neaten MAC specific instructions