Audited code, removed majority of yellow flags