Cleaned up + added sidebars
Renamed and removed some functions