format change only
bug fixing and cleanup