Cleanup commented code, align bar ID's, add To-Do's