trying to modularize and write proper checks and fixes for stig issues