Code cleanup
Resolves merge