Made class pluggable and improved some formatting