Some code cleanup, still working on scrollspy and active