simplify and declutter