Small Code clean up