Some cleaning up, moving stuff around