Fixing all dependecy issues

With all whitespaces issues out :o)