Nothing
Merge resolved, minor code cleanup