Cleaner, better code