Removed if class_exists wrapper around classes & reformatted