Clean up from Bar and Antony code review. Found an issue with the header file were it could end up corrupted.