Skip to content

clean up of logic

clean up of logic #298