Privatized all variable - Mostly clean now