Simplified more things