Some randome code clean up