cleaner, consistent define params