Some random cleanup
Fixed commands in sample app