Fixed pasting issues
Code style fix for classes
Class exists wrapped around classes