Audit Fixes

Fixed "Unnecessary Type Cast"
Fixed "One Statement Per Line"
Audit Fixes 2