Sidebar imports are not needed.
Code formatting tweaks.