(#99) Moved configuration into user settings

Also a small bit of code cleanup.