Some code cleanup and archlinux package