Skip to content

Consolidate code

Consolidate code #13