Cleanup styling and fix comments