Basic cleanup and visual improvements.