Code cleanup
More clean-up