Code cleanup
OR fix