Removed the ugly public variables