Slight code clean up