Light code cleanup 

Nothing very interesting, light code cleanup on