Clear spacing.
Added visual refresh.
Changed '-' to '_'.
Cleaned up some functions and naming.