Fixing some indentation, removing redundant dependencies