Cleanup syntax for variable declaration