Removed some copy pasta issues