Code cleanup
More replaced patterns