Cleaning up for meeting

Just some cleaning for today, mostly comments and so on