I think that you could do a little of clean up here