Re factoring
fix class error
write code...