Skip to content

Code cleanups

Code cleanups #338