better editor fix. code clean up