Simplify initial variable declarations