Cleaned some shit up