cleaned up a bit in dependecies and code syntax cleanup ;)