Removed the fancy things, updated class names, fixed a bit more formatting