fix type comment
fix type comment
Refactoring
layout and languages