Code cleanup (maybe)