Formatting updates. Next need to test move functionality to cluster
aliases and the entire cluster