Minor style changes, removed debug output, preparation for capsule build logic