Make commands private to commands package
Format constant declaration differently