more code cleanup attempts
most quietest warnings yet! :)