General cleanup

Cleaned up spacing
Changed flash message for readability