Reduce variable scope

[NateIsStalling]

Reduce variable scope to follow best practices and avoid issues with improper access to variables

• reduce variable scope to private or protected as appropriate
• use getters/setters where appropriate