Code cleanup

Just white space changes and comments and "Select Markers" -> "Select
Guide Markers".
Merge branch 'itemFactory'