Removed some dependencies, some ugly REs...
Removed comments
Parsed '.' present in a name