Removed global's to comply with Coding Conventions