ArchiDroid_Init code review
This should solve all the issues