Improved the source

Sped up the starting process, removed unnecessary code