Refactor syntax for consistency
Fix styling for terminal inputs so that it lines up correctly