Small Code improvement