Changed access to private for selected methods
Removed unused preview code