Large code refactor to fix convention adherence
Minor change to reflect use of system headers better