Removed HTML out of class