Any improvements to be made here?