Improved format, removed cmd functions