Random code clean up