Removed some more repetitive code