Avoids possible global, fixes declaration style