reindent , remove hardcoded