Added underscore before member variable names
Removed static keywords