Additional code clean up, working through splint errors