Testing

makes code beauty and little fixes