Cleaned up of some var_dumps