Mostly code readability fixes with some renaming and comment
updates. Also fixed some log error messages in the cluster handler.