Reword some more comments
Add keyword names to scheduler call
Code layout