fix name of class
fix header
add align