Fixed all code audit violations, still need to complete comments