Code cleanup

r?