cleaning up package source a bit