A little bit of internal restructure/cleanup