Skip to content

Type cleanup

Type cleanup #465