Made it a bit more polished