Cleaning up for meeting

Just some cleaning ups