tidy assignment and declare section