Fixed Use Declarations and Definitions, Moved Incrementing Variable